Merge.
authorSteven Smith <ssmith@xensource.com>
Fri, 1 Dec 2006 12:03:38 +0000 (12:03 +0000)
committerSteven Smith <ssmith@xensource.com>
Fri, 1 Dec 2006 12:03:38 +0000 (12:03 +0000)
commitbecaa718c2ed86f6fe8ace84efa08f51902f310b
tree745f23978855195957cae697c8c1a8c807c6b59c
parent14dc44913037f6e2ba9a2871addd3d4a49498797
parent43bcc64d9992847e69c9b65c290d5bf6d01f1753
Merge.
tools/python/xen/xend/image.py